bugfixes, made a new one