Shifting things around a bit; cleaning up docs