Performance tweaks. Fixed.