Cleanup / Adjust Build
API adjustments

allow non-cancellable dialog
return preselected items