Categorization finaly working, minor fixes to scripts.