fix changes based on comments