Improved nest parser, general tweaks
2.0.0