Made changes to fix compilation errors and add review functions