Liang Edit, #1

Fixed a lot