stupid bugs fixed