good news: i have patches that i'm fairly sure fix...