comments, cleanup, v1.1 tickets