fix strict warnings on variable assigns
fix activity parsing
Merge remote-tracking branch 'origin/master'