add exeptions + fixed bags