Liang Edit, fixes #1

A lot changes