fixed builitin_functions and octals, added allcaps