fix the stupid bugs