A few more tweaks and comments