some updates / fixed bugs with category