fix some todos in serialization
Merge branch 'overhaul' of darwin:scout into overhaul