Many more improvements