Finished for today smashed all importatnt bugs