comments and minor tweak