Lots more improvements