Added shake, and fixed some bugs
Added finish dialog