comments and tweaks