added changes for reported issues
added changes for reported issues