Cleaned up some code, revamped smash mechanics