implemented QA updates from Steve