minor fixes; adding component service