commented out some stuff and enhanced comments a bit