Dictionary + fixes
Dictionary + fixes