removed debug
Improvements in Entity and List