Reflects 0.0.1pre2b. Redstone fixes.