Debug information, some refactoring
Adjusting alg for other data, many new warnings