More minor structural revisions as well as a bunch of visual tweaks