Fixed more weapon issues + added more weapons