updated some logic errors in engine
merged the engines into 1 super beast