3.26 Last commit and push
fix some bugs.. and modify loading message