Better documentation + various cosmits