fixed faces, added begin/end faces, cleanup