did some base updates. forgot to check them in earlier