mior bugs fixed