Few more tweaks and stuff
New SWMH Compatch stuff