Added editable name and tag for entity. Killed some bugs.