Added update mail and fixed some critical bugs