Made some small improvements today as a quick fix; we'll still be working on better support long-term