Work from over the weekend, crashey is less crashey (at least in the sim)
Change function signature to make it compile
fix minor typos