adding teapot, fixing mapping in loader