- cleaned up settings and todo

- minor code cleanups