fixed engine components; updated engine layouts; added hps calculation