dict fill code and fix