Update and Cleanup

Did some Cleanup and updated to fit the most recent version of the mod
including MCA support (a big thx to WildBamaBoy)