Bug fixing, code validation