More info and fixes