change regexes to match when spaces are put in things

Signed-off-by: James Rubingh <james@wrive.com>