Bug fixes, correctly parses sample.lang