Fix: enhancement of namespacing and small fixes.