Last small fixes, Debug code raus