Updated info and fixes