Wording improvements, better server-side checks