Minor fixes / cleaned to-dos