Update to is_dev, misc edits