small updates + fix in service