Implemented some more setting, restaured an accidentally deleted method
Implemented the last settings, now require testing.