Some improvements + working on weapon customization