Draft

Topoplot extended + some fixes.