fix spacing in some places, work on engineer