Merge pull request #1 from sly7-7/master

Fix minor things
contacts count fixed using needs