Added: various touchups, :run