fixes and default values
Merge branch 'master' of https://github.com/deanshub/SocialCoding