Some bugfixes, lots of progress