fixed most debugging issues now