Fixed rebound glitch, minor bug fixes