fixed up more slap stuff