Static members become object members. Minor bugs corrected.