fixed small issues, removed calc_current srv since it can be done in node