Merge branch 'bea' into david3
Major cleanup. Added Javadoc comments, deleted commented out code, etc.
Merge branch 'david3' into david4