Fixed rebound glitch, minor bug fixes
Merge pull request #12 from walsh06/bugFixing

Fixed rebound glitch, minor bug fixes