fixed some bugs for birthday branch. 28.08 22:53