Bug fixing and performance