Conflict Of The Universe: bug fixes

bug fixes