further changes, still no bump mapping