bug fixes, support for cic.naco.org