corrected some and tested all serviceapis