Fixing preferences and adding user control