Parameters cleanup; swithching to graven as default
Fixing typo