Minor improvements to Mike's new commandlet. Welcome to the team Mike!