Add system preferences
Fix small typos and bugs