Took out some of my bad code; added new wisps