common.js remaining bugs