more comments & lints