some bugs fixed
fixed more bugs