Small fixes
Added graphical preview