Small changes

I've added some changes but some comments need to be flushed out