numerous bug fixes; release build;