fix remaining small remarks