Added TPAOverlapTPA method

Also did some merging and small tweaking