More engine working/reworking