Fixed bugs, now its time for qa and for adding animations