Merge Preview Fixes back to Dev

This should keep updating as we add new commits to preview that aren't in dev. All these changes have been reviewed in 'preview' so feel free to disregard, or skim it if you want a reminder :)