Add settings, and some misc stuff