add some comments to these guys
some cleanup of unused code