Added faces, made some changes