fix bugs
Merge branch 'llsbranch'