Made minor changes to Controller2D and stickyTrap