more or less final

(bugfixes still missing)