Made some small changes
Small changes to source