aded service if
fixed few bugs found in others classes