cleanup
bugfixes after fomp by @rix0rrr
typo