Issue #12: Fixed pad bouncing
General cleanup