Some improvements

Some improvements
Things happen slower

slower