Random cleanups
Add Exceptions