trival improvments