Fixes and integration for markdown parser
Started work on improved tokenizer