added and resolved  issues