update makrdown parser, cleanup