-fixed a bug with timeline deletion -cleaned a few things up