Fixes #54, Fixes #56, Fixes #57
submodules break updates, forcing
whoops, working on wrong branch
attempting to fix submodule