some typeos and fixed