bug fixes with latest features