add missing stuff from @Andromadus kernel after this merging madness