Various minor bug fixes and changes to make development easier

Removed quick fix, but can now demonstrate clearly where the bug exists (valid parse for "table leg" cannot be found due to local optimum early in parse)