and many updates inside and out