Various fixes and markdown