fixes and notes