now we use namespaces
little bug fixes