Massive improvements to thin cli