140207 huge update
oops i missed one, oh well cleaning up some stuff
merging changes from original project