finished minor changes