misc functionality changes