Some documentation changes, cleaning up the imports