small changes + missed change set in master changelog