Issue fixes

all defects fixed