various changes that don't make anything actually work yet