more improvements
ok, this is ready to roll out