fixed up some stuff and add classes