Renamed a few describes.
Added a few TODOs.