Added info for entities
Added a few TODOs