Massive Fix Rouge Trader

fixes and improvements