bug fixes, added first-, last_name support (wp)