Added empty calsses for key wizard, fixed two bugs