fixed collision and smooth animations