Bug fixing and code alignment.