Last minute text edits and fixed validation errors