Add CLI Help, More Lazy Data Retrieval