some fixes. optimizations. added short options. added time estimate options.