fixed bunch
Merge branch 'daemon' of https://github.com/mikedewar/streamtools into daemon