Further fixes and development, still in flux, pushing so that Grandil will have the correct version.