Altered settings and added todos