Add info cmd and misc improvements