add some more .*s and try to make 'em work