bug fixes + markdown support