more improvements!