Minor updates
Added arg for ID swap map to Component.Clone()
Reworked InputValidator() function