More tweaks

(Still a lot of work to do)