Added multiple-cursors and just some general cleanup.