Fixes, moved call tool up