Fixed categories, sped up loading.