Dealt with Brian's corrections and first try at markdown support