Cleans up imports and a few more merge fixs

Fixed one bug from the merge where games did not close

Author: lhunker