build & logic fix
logic fix
improve rage cod
some more logic fixes