Generalize a bit

Signed-off-by: Jonas Kalderstam <jonas@kalderstam.se>
Timestamp and comment fixes

Signed-off-by: Jonas Kalderstam <jonas@kalderstam.se>