Actually return the message type
Refactor logging of builds
Remove pointless looping on broken clients
TODOs