Cleaned up and added saved markdown support