cleanup & more debugging messages