Minor improvements + more docs