comments and small tweaks