Fixing beam of light and adding little functions