All gameplay features running again, fixed several logic bugs in refactored methods.