Fixed stuff broken by merge...
More bugfixes due to merge...Game still doesn't run