added changes for reported issues