Fix the specs mostly and some cleanup
Merge pull request #3 from flori/fix-specs

Fix the specs mostly and some cleanup