Entity list adjusted
Forgotten const defines
Multiple updates for new functions and renames