Major fixes done. See todo.md