formatting a bit, extra comments
minor merge