More bug fixes + tag wrapping for Q3 -- not sure if i'm allowed