More bugs killed, and a little docs