bug fixes and help