bugfixes, * and & fuckery