changed to base exceptions and did some renaming