Fix: minor bugs and code clean up#129

vizsatiz merged 2 commits into

developrootflo/wavefront:developfrom

fix/bug_fixesrootflo/wavefront:fix/bug_fixesCopy head branch name to clipboard