Minor edits, gun coding changed