Made further changes, cleaning up, building out story further