made various improvements