Changed String s > name
Cleaned Inputs
Fix > Temp Fix: #2