Small fixes, some comments and a new test