Add some comments, clean up imports.