Mostly Bugfixes

Fixes a bunch of derps with the two devices. Also added some more
skelington code.
Minor Version Update