rectangle term, includes term. Bug fixes.