Modifying comments, updating manual and setting up new tests.