Some redstone control fixes/enhancements