Clarified Usage and added TODO