Fixed conflicts w/ Mr Baekkovold.
Merge fixes.