fixing bugs and fixing bugs