Cleaned up formatting for numeric values;
Added extra exceptions;