Merging some staging developments, including Alex's ROCKS code and some
core updates/optimizations.

This brings us to 0.9.