move bugs fixed