Resume dia-dan-aku story + fix some inconsistency