Work2

Minor tweaks