Add some comments, minor cleanup