Everything but probability: minor adds and cleanup