Fixed suicidal bow. Also renamed some files