added comments; added support for faces