final committ for master

before i switch to an experimental branch!