Added two rows of members, other miscellaneous fixes.

Fixes #5.