still missing some bugs

wfevwefv