some pmd and fixing with entities and physics