Bugs plz fix


#1


But really, it will be ok, be patient