more bugfixes - still buggy