fixed all of the crashes on master, will cut a new release!