minor updates + fixed validation errors