Bug fixes
Name changed due to import issues
Added report functions