removed some commented out stuff
something or other just trying to merge
fixing things