comments and serious bug wtih upgrader code