fixed and removed debugger stuff