bug fixes
Merge branch 'daedlines-visualization'
Merge remote-tracking branch 'origin/master'