Fixed imports and package, tweaked documentation