MERGE + FIXES

Merged with kevin's code
preferences now save properly and are defaulted on first start