More changes, changelog will be added when it merges with master branch