Fixed join messages
Brougt back few pieces to work correctly with the db etc
Merge pull request #3 from horoking/master

The Update that changes everything