Fixed some more bugs and dependency issues. Added a couple version bumps for good measure.