added gun and fixed some errors