fix bugs and values;