Did some code cleaning, fixed a few breakpoints