cleaning up imports
cleaning up imports (again)
cleaning up imports (again)
adding test and always casting timeout as int
minor docstring and comment fixes
minor comment fixes