Loads of cleanup + merging from recent projects etc
Fixed conflicts