Added some more functions; added some exception handling