Cleaned up comments, moved the argv logging to the correct place