Added a few decorators, rewritten some parts of the dict-container, and some other rewrites