Fixed #15.
Fixes for minor errors.