Bug fixes and reports added