More bugfixes. Getting there..