Changed most contractions, added tribler update

also miscelanious fixes.