fix spacing and some old stuff from #163