Oops. More fixes.
Newest code...