Some fixes, added username to categories