Adding comments

Tidying up some crap also