redesign; bug fixes; etc