Merge all the new things from dennis!