Tutorial/Settings Fixes