fixing stupid bugs