preserve debug information at least when saving the whole file
merge, some fixes, use namespaced names