minor fixes from issues in last PR
fixed conflict