Minor Bugfixes & some cleanup
More Cleanup
Even more cleanup, moved to Forge conflict resolving config