Fix substring error message
Fix some == issues with numbers