Parse kill, also fixed some client data collection