small fixes and soap calls support