Categories added, many bugfixes