Some updates to the functions

* Fixed if statements == int or == str