minor bug fixes
guru related simplifications and bugfixes
cleanups, bugfixes in guru related probers, abstractor etc.
lock added to statesofmatter, waves.
multiple bugfixes
Merge remote-tracking branch 'choose_remote_name/master'