Updated to 4.1.0e and fixed some mistakes.