Adding better commenting
Adding Catch support
Fixed "Argument Error" not Domain Error