Improved logical parsing; documented unsupported cases