add support for env maps
cleanup