fix make-frame bug & finish 2050