some design bugs were fixed again