Updates to comments etc