added the ability to specify variable weights in tps objective
resolved merges