bug fixed
more dict things