a few small improvement