Some changes

Hi @iho-ableton - yes, it seems possible to make a pull request from master to master.