Script update, formatting fixes.
Reduced number of generated services, fixed sorting of free services.
Merge pull request #8 from JonNatanael/master

Small fixes, database script updated