Add settings
General cleanup