fixing messages, moved validation annotations