Changed so free services state that explicitly. Some other minor fixes.
Merge pull request #3 from JonNatanael/master

Free services