good round of updates and cleanup
commented code