fixed up some errors remaining from last commit