small cleanups + comments
handle quads separately