changed handling mod selection
Cleanup and Merge