Bug fixing and code review