#625, #365, code upgrade, security, errors, fxes