errors noted in last commit corrected