Optimization.
Fix copy/paste bug.
Minor bug fix.