more comments and layout fixes