Removed trailing spaces
Added support for numeric, better error messages.