Added more loading and some bugs fixed.