Fix issues and update contents
5 files changed