Updated comments etc.