Added way to change defaults, changed choice options