fix recent mistakes