added a few TODO items
added more ignores