Bug fixing, bTemplate update