Bug fixes and notes