fixed filetree
updates to entities