Lots of little changes. I have somehow managed to break variant parser.