Minor comments and tweaks