Feature update
Correct comparison for era block
Corrected mistakes