Final tweaks for version 1.0