Updates

Some improvements, waiting for tok approvements
Merge remote-tracking branch 'origin/master'