fixed up some of the issues from the merge, still have a few issues with the enemies dying