more bug fixing.