Parameters cleanup; swithching to graven as default