Fixed up some of Ana, and Ini where needed, still not running