lots of small tweaks. Almost there!