Minor updates & Fixes