UPDATE 3

Fixing some issues.