optimized some things, disabled the null pointer exception that sometimes occurred when starting the engine