Failed assertion fixes

I'm opening this issue off of a branch in the main repo to replace #15. See said issue for any previous discussion.