More documentation, fixed unused imports