Text tweaks and bug fixes