Fixed rebound glitch, minor bug fixes

Now its actually fixed :tada: