Added resync command, more validation