Added comments

And removed old stuff