Various cosmetic changes, bugfixes and improvements after discussion
with Max in the cabin.