ninlilizi Fixes, mostly.