Added settings
A lot of changes...