lots of little formatting improvements