fixed the mentioned points