Cleanups

I still have more cleanup to do, but I don't want our forks to get so far apart.

The Bone101 stuff is rough, but I think I'm OK with it being in there. Let me know your thoughts. Worst case I think we can just remove it from the index.