bug fixes and notes