bugs fix; name changes