Some frontend and wording fixes