bug fixes and refinements