fixes as per #3 issues, except teapot :)