now bug-free
that seems about done