fixed few issues which Jaya mentioned.