fix remaining outstanding issues