Changed the status of a few TODO items; Un-stupid-ified entity absorption