Added help-text and small tweaks