Some more fixes, added categories!