Documentation fixes and import organization, nothing fancy here.