moving bugs fixed