Bugfixes for message handler, updated entities