updates

issues are solved.