Fixes minor issues and adds additional CasBuilder options