Fix typing issues, spread types around more widely, use docs for clarity
Fix typing issues, spread types around more widely, use docs for clarity

witheve/Eve,shamrin/Eve,nmsmith/Eve,shamrin/Eve,shamrin/Eve,witheve/Eve,nmsmith/Eve,witheve/Eve,nmsmith/Eve