fixed calls, added debug