More tweaks to Social and Traffic system parts