Somebugs corrected.