Documentation, tweaks, cleanup