New features integrated and fixed.
TODO: continue to integrate the object/namespace structure