Endpoint scaling - taking advantage of the new parser.

Use of additional keywords.  Some error/consistency checking. Fixed a few bugs.