More comments and docs