Fix A Few Bugs. Fixes #6