Add comments, change output formatting slightly