cleanup
Merge branch 'remotes/mihi/modul' into modul
pass more functions through to cube