removed apikeys
added regex to several subroutines