more comments, some formatting