More regex fixes and additions imported from nZEDb