Some script and settings updates