Improved the Gun and fixed some bugs