The plot really needs a tidy up