fixing bugs and latest