Bug fixing and latest update