Commented out demodata part of mainwindow and fixed all problems that
arose
better randomness in demodata