overhauling some things and bumping the version