added category support and tweaks for online release