updates to spacing and type