Minor updates & fixes.