general cleanup/updates to configs