Major bugfixes
Major bugfixes