Added preference bundle, other fixes, etc