Bug fixing and debugging...