few remaining changes