Version update.
Make code more consistent.
Dupe bug fix.