Minor tweaks, remove debugging stuff