Various work and closed #157.