small bugs to fix
fixed a few bugs, added category support