fix stupid bugs