tidied up cb skills and buildings