Minor updates + fixed validation errors