Changed regex for better phonenumber matching. SOme tweaks and bugfixes.