release, small refactors