add some comments
remove commented out stuff