Minor Chages

Issues verified and resolved