misc
improved cli, add specs