bugs fixed

#1 #2 #3 fixed