new pull

This is the update for after I fixed things upon the merg from Jared's fix for tags