bugs fixed

bugs fixed