added formatting
fixed some query_string params