fix some minor bugs
Merge branch 'L2bug_fix' into gh-pages