Several more improvements