finished last tweaks and comments