Working

Trimmed unnecessary arguments, added functions to identity, consolidated error reporting and usage statements.