More Bugfixes

Fixed more bugs with redstone, and changed how the block saves on/off
state.
Remote merge