fixed few mistakes here and there