More fixes...It works now.