Removed some dead code/pushed off some todos as future
Made custom exceptions serializable