more cleanups
more mocks
version, comments