Fixed weight in draw
cleanup