Add some comments, tighten up some things.