Cleanup and new help documentation