removed too many non-implemented features, simplified cli