cleaned out some commented code and fixed #755