fixed errors in service + models