edited some small things
partial commit
code cleanup