fix stage values and add status