minor bugs
Merge branch 'master' into searchConstruction
testing stuff to improve user experience
testing