some additional support for stuff, mostly old format