fixed bugs, continuing review