Update and TODO

TODO: Make the Markdown parser work again!