Finishing to debug the biggest things

Certainly more small bugs, but on the overall it works for me!