Updates and lotsa comments