Fixing up some imports and docs.