more stupid bugs fixed