small changes, mistakes and so on