Some logistic changes. Copy-pasta fixes.