tweaks before merging/deleting dev