Cleared out stuff i don't have time to write
Improved exceptions