RC2 tweaks

Tweaks to get ready for prime time. Fixes issue #13