dict improvements
dict improvements