several fixes
fixed creepy bug