General fixes collision codes, still not working