major bugfixes, final dev stage