bunch of small changes, styling mostly