Some debug output, more options for test data, more comments