final changes from feedback