first some collision rubbish
fixed some icons and some stuff and stuff