update

cleanup and fixes

extend cli options