a bunch of working changes
Merge branch 'master' of https://github.com/wpfff/qtlab-user-diamond-master
small stuff