Bug fixes

0.0.8 Pre-Alpha