fixed bouncing and undoed 'bugs'