Multi-threading issues worked out plus some CLI niceties.