Refactoring +slight gameplay changes

A lot of refactoring and cleaning up code, plus some small bug fixes