just fixed up some stuff for new branch