progress on review screen, working out bugs