added report service + some fixes