major cleanup, RC for second production version