final tweaks and comments