More config/script updates