Fixing examples and tidying up schema