Complete V1.0

Previous commit unintentionally left out many changes that were to be
part of V1.0.