Added in Settings menu, fixed small things