priorize calls + minor fix