minor functionality changes