cleaned up code a bit, fixed redstone, speed increases