MAJOR BUGFIXES