fixing bugs, refactoring. Bumped out deploy version to 0.0.5