Initial commit
Settings fixes