DO NOT MERGE: Fixing Entities

Don't pay atention, yet another debug output :)