Fix and added some info