Added default values, updated some descriptions to match spec