Some various changes, currently working on PPclock seg faults.
Woops. Here's the updated file.