More fixes & updates.