numerous bug fixes.