fixes regarding the last two commits because of Franks nagging