cleanup; entites now use Dir for direction