bugfixes(mainly)