minor changes + String.match implemented