updated some contents and fixed some issues