lots O comments, and few small fixes