Several fixes & updates.