fixed up some basics