Masse fixes, litt overalt
Merge fix