fixed a few finish bugs, improved user interaction flow