fixed a few bugs, added category support