bug fixes and new features