Many many bugfixes!!