Various alignment and doc fixes