Fixing a couple random bugs and completing Issue #1.