Updated CHANGELOG
Several fixes + refactoring