Design modifications. See corrections. Fix bugs.