major set of bugfixes resolved