threading fixes, not using controller, added debug