Added  exceptions
Fixed minor derps