Fixed some stuff.
More work on Shouli.