fixes from techical reviewer