Fix some bugs and update pages