Add options to scripts and flatten aliases and support draft, etc. better