couple more improvements