2 major bugfixes