Added better error handling, fixed small issues!