Config cleanup

Global config cleanup
Added weapon type scaling