le bug-fixes

I didn't check my changes. Now it looks fine.