lots of tiny tweaks