Shutdown corrected, added diff
Fixed conflicts, and did other stuff
Merge?