fixed extrusions and tidy up