lots of aesthetic changes