Tons of bugfixes
Merging bugfixes