Fixed indentation of multiline comments; what happened to them?
Implemented Listener and thread safety for FaceManager