Fixes/rewrites for ext-surfbar: