More aesthetic changes (mostly)