Removed some TODOs
Documented a "raises"