Added report handling

renamed several methods