new option overwrite + small improvements