Adjusting paddle movement & a few fixes