and some more formating that i missed