more comments and docs