added more methods and now using XML for output to get more reliable folding in sublime