bugfixes. maybe