Allegedly final commit. Many improvements.