bugs fixed again=(