Completed extended options, added inbox command