comments and some small tweaks