much much bugfixes