lots of aesthetic improvements