fix issues and update files