Little fixes + gun shots