#7: Finally fixed the EntityHandler problem and added several docs.