bugfixes
More progress