Fixed rebound glitch, minor bug fixes

Rebound glitch has been fixed :tada: