misc refactorings
update changelog