Add exceptions, readme cleanup