tweaks and improved errors.