tiny tweaks and fixes