Continued bug fixing.