fix review point 11
fix review point 8
fix review point 9
fix review point 10
fix review point 13