Gun delay added, timer improved