Final tweaks for v 1.1