Some comments and fixes before tests.