fix dict
fix comments