updates to clarify behavior, provide better backwards compatability, and just generally resolve failed tests