added ack mapping
fix merge conflicts
added php mapping ;f to lookup function on php.net