Better comments, remove excessive commented out debugging lines.