Documentation, small cleanup