Categories somewhat improved