small fixes already done on tw production
Merge pull request #725 from ahilles107/fix_performance

small fixes already done on tw production