Some more tweaking and docs