routes fixed, validation semi-functional