Small fixes, binary should work now
Fixed bug for messages with no variables defined.