service bugs fixed..